Merge from mainline.
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 31 Jan 2011 06:47:55 +0000 (22:47 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 31 Jan 2011 06:47:55 +0000 (22:47 -0800)
commit0adef1f2012ef918168b56593e35fca3854d8645
tree2f7d22e154c9d070acf9b7d09ac6e19a8c690196
parent14b317e6d533ff1745e2b9f6fc3f7cab1153ee3b
parentcac724dbfd8c5d3c5f4f618ac040cbecabe05e51
Merge from mainline.